gtkcontainer: Move private functions to private header

https://bugzilla.gnome.org/show_bug.cgi?id=651707

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 19b187a45a37d9663199c75c4b70cbd09c80618e..1fd9555d026c36284b34f5c8262f1af26f85f6db 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -386,6 +386,7 @@ gtk_private_h_sources =             \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcellareaboxcontextprivate.h  \
+       gtkcontainerprivate.h   \
        gtkcssparserprivate.h   \
        gtkcssproviderprivate.h \
        gtkcssselectorprivate.h \

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4b27fd621004d7cd36680e4789b0efcd0ca0b516..fc27dd11ee1523db2e64963a55c98f06d12ab2dd 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "gtkcontainer.h"
+#include "gtkcontainerprivate.h"
 
 #include <stdarg.h>
 #include <string.h>

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index a19d90f9d1bf58b9f5f09545d176d9aa8b968c28..afd2acea1901f3bccae2de75b22095557d9a68ab 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -221,22 +221,6 @@ void    gtk_container_forall                    (GtkContainer *container,
 
 void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
 
-/* Non-public methods */
-void   _gtk_container_queue_resize          (GtkContainer *container);
-void   _gtk_container_resize_invalidate     (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-gchar* _gtk_container_child_composite_name   (GtkContainer *container,
-                                             GtkWidget    *child);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-                                             GList            *children,
-                                             GtkDirectionType  direction,
-                                             GtkWidget        *old_focus);
-gboolean _gtk_container_get_need_resize      (GtkContainer     *container);
-void     _gtk_container_set_need_resize      (GtkContainer     *container,
-                                              gboolean          need_resize);
-gboolean _gtk_container_get_reallocate_redraws (GtkContainer   *container);
-
 GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
                                                   GtkWidget         *child);
 

diff --git a/gtk/gtkcontainerprivate.h b/gtk/gtkcontainerprivate.h
new file mode 100644 (file)
index 0000000..4d77979
--- /dev/null
+++ b/gtk/gtkcontainerprivate.h
@@ -0,0 +1,44 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright (C) 2011 Javier Jardón
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef __GTK_CONTAINER_PRIVATE_H__
+#define __GTK_CONTAINER_PRIVATE_H__
+
+G_BEGIN_DECLS
+
+
+void     _gtk_container_queue_resize           (GtkContainer *container);
+void     _gtk_container_resize_invalidate      (GtkContainer *container);
+void     _gtk_container_clear_resize_widgets   (GtkContainer *container);
+gchar*   _gtk_container_child_composite_name   (GtkContainer *container,
+                                                GtkWidget    *child);
+void     _gtk_container_dequeue_resize_handler (GtkContainer *container);
+GList *  _gtk_container_focus_sort             (GtkContainer     *container,
+                                                GList            *children,
+                                                GtkDirectionType  direction,
+                                                GtkWidget        *old_focus);
+gboolean _gtk_container_get_need_resize        (GtkContainer *container);
+void     _gtk_container_set_need_resize        (GtkContainer *container,
+                                                gboolean      need_resize);
+gboolean _gtk_container_get_reallocate_redraws (GtkContainer *container);
+
+
+G_END_DECLS
+
+#endif /* __GTK_CONTAINER_PRIVATE_H__ */

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 521f814d52b875b43ae424922cde048df3341b9b..c54bc79244be6778f100cc5f278d2530d213d880 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -48,6 +48,7 @@
 #include "gtksettings.h"
 #include "gtksizerequest.h"
 #include "gtkwindow.h"
+#include "gtkcontainerprivate.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"

diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index a787e6b66c53c2308f03bb9614f76b40bef339e8..7be0fb30ed56b3f4c4768b86242c23812f648c6e 100644 (file)
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -22,6 +22,7 @@
 
 #include "gtkoffscreenwindow.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
 #include "gtkprivate.h"
 
 /**

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 27324cf8812c84e1cf86eaeb22d2e5f67723dd4f..ba9a803c04636bbfed4c52dc9070c84762500d87 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -28,6 +28,7 @@
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
 
 
 /**

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 95079d9015ac20c47c6033acedb767d96a0ec5cc..17ebd4447b1a550db562fce4b474096453908970 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -48,6 +48,7 @@
 #include "gtkwidget.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
+#include "gtkcontainerprivate.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkaccessible.h"

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index cf476ac6a7448b28e5dc7d627e10da1a71d13b29..76d029edac9cce0bb87b9a1d72fa15d5de78ae7b 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -48,6 +48,7 @@
 #include "gtkplug.h"
 #include "gtkbuildable.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"